Use AM_PATH_GLIB instead of glib-config directly

1999-10-18  Havoc Pennington  <hp@pobox.com>

* configure.in: Use AM_PATH_GLIB instead of glib-config directly

* src/Makefile.am: Re-enable testpixbuf with GTK_CFLAGS/GTK_LIBS

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index e720f19355f29468c399ee980bf14f456fc7ce05..e1a37347f4329c14aae31746954e485842891c92 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,9 @@
+1999-10-18  Havoc Pennington  <hp@pobox.com>
+
+       * configure.in: Use AM_PATH_GLIB instead of glib-config directly
+
+       * src/Makefile.am: Re-enable testpixbuf with GTK_CFLAGS/GTK_LIBS
+
 1999-10-18  Havoc Pennington  <hp@pobox.com>
 
        * Makefile.am (SUBDIRS): Remove "macros"

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 25dcf9f00c41afaa7861944e18b3679e9d473243..89bab3e840fa1cb49d87ff0a59351bfc4c27cb48 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -29,14 +29,14 @@ libexec_LTLIBRARIES =               \
        $(XPM_LIB)      \
        $(TIFF_LIB)
 
-noinst_PROGRAMS = # testpixbuf
+noinst_PROGRAMS = testpixbuf
 DEPS = libgdk_pixbuf.la
-INCLUDES = $(GLIB_CFLAGS) $(LIBART_CFLAGS)
+INCLUDES = $(GLIB_CFLAGS) $(LIBART_CFLAGS) $(GTK_CFLAGS)
 AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\""
 
 LDADDS = libgdk_pixbuf.la $(LIBART_LIBS) $(GLIB_LIBS)
 
-testpixbuf_LDADD = $(LDADDS)
+testpixbuf_LDADD = $(LDADDS) $(GTK_LIBS)
 
 #
 # The GdkPixBuf library